Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Salvage cloak #631

Merged
merged 8 commits into from
Jan 19, 2024
Merged

Salvage cloak #631

merged 8 commits into from
Jan 19, 2024

Conversation

lleftTheDragon
Copy link
Contributor

About the PR

Gave the Salvage cloak back to salvage, it rarely spawns in the locker and also should spawn in the salvage crates on salvages.

Why / Balance

Added this awhile back, same reason as then. Wanted to give salvage their own cloak outside of the mining cloak as salvage isn't just about mining

Media

Screenshot_798
Screenshot_799
Screenshot_800
Screenshot_801

  • [ x] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
🆑

  • Added Salvage cloak

@github-actions github-actions bot added S: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Jan 1, 2024
Copy link
Contributor

github-actions bot commented Jan 1, 2024

RSI Diff Bot; head commit 36aff59 merging into df92f0f
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi

State Old New Status
equipped-NECK Added
icon Added

Edit: diff updated after 36aff59

Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move the salvage.rsi folder into the same directory under Textures/DeltaV/..., also fix the errors in regards to the incorrect filename equipped-NECK3.png

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml Outdated Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the purpose of the 3 in the filename? If it needs to be there, then it needs to be present when you reference this file, hence the errors.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed it, it was a hold over my B

@DebugOk DebugOk merged commit 16e0774 into DeltaV-Station:master Jan 19, 2024
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Jan 19, 2024
DebugOk pushed a commit to DebugOk/Delta-v that referenced this pull request Jan 20, 2024
* CLAOK TO BRRR

* Correct cloak placement

* more corrections

* removed unwanted code

* Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: lleftTheDragon <[email protected]>

* Update Resources/Prototypes/Catalog/Fills/Crates/salvage.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: lleftTheDragon <[email protected]>

* Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: lleftTheDragon <[email protected]>

---------

Signed-off-by: lleftTheDragon <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>
(cherry picked from commit 16e0774)
DebugOk pushed a commit to DebugOk/Delta-v that referenced this pull request Jan 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants